From 1a6efe96a73531e25ea1e3b4d2d132223b57b6ff Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 1 Jun 2001 15:44:13 +0000 Subject: [PATCH] Add GDK_TYPE_RECTANGLE. Fri Jun 1 11:31:55 2001 Owen Taylor * gdk/gdkrectangle.c (gdk_rectangle_get_type): Add GDK_TYPE_RECTANGLE. * gtk/gtkwidget.c (gtk_widget_class_init): Fix type of allocation argument be GDK_TYPE_RECTANGLE. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/gdk.h | 2 ++ gdk/gdkrectangle.c | 24 ++++++++++++++++++++++++ gtk/gtkwidget.c | 4 ++-- 10 files changed, 84 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10675e5e88..83244f90b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Jun 1 11:31:55 2001 Owen Taylor + + * gdk/gdkrectangle.c (gdk_rectangle_get_type): Add + GDK_TYPE_RECTANGLE. + + * gtk/gtkwidget.c (gtk_widget_class_init): Fix type + of allocation argument be GDK_TYPE_RECTANGLE. + Thu May 31 12:43:57 2001 Owen Taylor * gtk/gtkoptionmenu.c: Account for the fact that the border diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 10675e5e88..83244f90b4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Fri Jun 1 11:31:55 2001 Owen Taylor + + * gdk/gdkrectangle.c (gdk_rectangle_get_type): Add + GDK_TYPE_RECTANGLE. + + * gtk/gtkwidget.c (gtk_widget_class_init): Fix type + of allocation argument be GDK_TYPE_RECTANGLE. + Thu May 31 12:43:57 2001 Owen Taylor * gtk/gtkoptionmenu.c: Account for the fact that the border diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 10675e5e88..83244f90b4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri Jun 1 11:31:55 2001 Owen Taylor + + * gdk/gdkrectangle.c (gdk_rectangle_get_type): Add + GDK_TYPE_RECTANGLE. + + * gtk/gtkwidget.c (gtk_widget_class_init): Fix type + of allocation argument be GDK_TYPE_RECTANGLE. + Thu May 31 12:43:57 2001 Owen Taylor * gtk/gtkoptionmenu.c: Account for the fact that the border diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 10675e5e88..83244f90b4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Fri Jun 1 11:31:55 2001 Owen Taylor + + * gdk/gdkrectangle.c (gdk_rectangle_get_type): Add + GDK_TYPE_RECTANGLE. + + * gtk/gtkwidget.c (gtk_widget_class_init): Fix type + of allocation argument be GDK_TYPE_RECTANGLE. + Thu May 31 12:43:57 2001 Owen Taylor * gtk/gtkoptionmenu.c: Account for the fact that the border diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 10675e5e88..83244f90b4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri Jun 1 11:31:55 2001 Owen Taylor + + * gdk/gdkrectangle.c (gdk_rectangle_get_type): Add + GDK_TYPE_RECTANGLE. + + * gtk/gtkwidget.c (gtk_widget_class_init): Fix type + of allocation argument be GDK_TYPE_RECTANGLE. + Thu May 31 12:43:57 2001 Owen Taylor * gtk/gtkoptionmenu.c: Account for the fact that the border diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 10675e5e88..83244f90b4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri Jun 1 11:31:55 2001 Owen Taylor + + * gdk/gdkrectangle.c (gdk_rectangle_get_type): Add + GDK_TYPE_RECTANGLE. + + * gtk/gtkwidget.c (gtk_widget_class_init): Fix type + of allocation argument be GDK_TYPE_RECTANGLE. + Thu May 31 12:43:57 2001 Owen Taylor * gtk/gtkoptionmenu.c: Account for the fact that the border diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 10675e5e88..83244f90b4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri Jun 1 11:31:55 2001 Owen Taylor + + * gdk/gdkrectangle.c (gdk_rectangle_get_type): Add + GDK_TYPE_RECTANGLE. + + * gtk/gtkwidget.c (gtk_widget_class_init): Fix type + of allocation argument be GDK_TYPE_RECTANGLE. + Thu May 31 12:43:57 2001 Owen Taylor * gtk/gtkoptionmenu.c: Account for the fact that the border diff --git a/gdk/gdk.h b/gdk/gdk.h index 0fc565f93b..4d5bc2b84c 100644 --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -126,6 +126,8 @@ void gdk_rectangle_union (GdkRectangle *src1, GdkRectangle *src2, GdkRectangle *dest); +#define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ()) + /* Conversion functions between wide char and multibyte strings. */ gchar *gdk_wcstombs (const GdkWChar *src); diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c index 499112d2dc..27e181c535 100644 --- a/gdk/gdkrectangle.c +++ b/gdk/gdkrectangle.c @@ -81,3 +81,27 @@ gdk_rectangle_intersect (GdkRectangle *src1, return return_val; } + +static GdkRectangle * +gdk_rectangle_copy (const GdkRectangle *rectangle) +{ + GdkRectangle *result = g_new (GdkRectangle, 1); + *result = *rectangle; + + return result; +} + +GType +gdk_rectangle_get_type (void) +{ + static GType our_type = 0; + + if (our_type == 0) + our_type = g_boxed_type_register_static ("GdkRectangle", + NULL, + (GBoxedCopyFunc)gdk_rectangle_copy, + (GBoxedFreeFunc)g_free, + FALSE); + return our_type; +} + diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 03d6f8ea31..f2ea169225 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -586,9 +586,9 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, size_allocate), - gtk_marshal_VOID__POINTER, + gtk_marshal_VOID__BOXED, GTK_TYPE_NONE, 1, - GTK_TYPE_POINTER); + GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[STATE_CHANGED] = gtk_signal_new ("state_changed", GTK_RUN_FIRST, -- 2.30.2